Skip to content

Sync from kubeflow/model-registry acdf013#8132

Merged
openshift-merge-bot[bot] merged 30 commits into
opendatahub-io:mainfrom
ppadti:mr-sync-2026-06-16
Jun 17, 2026
Merged

Sync from kubeflow/model-registry acdf013#8132
openshift-merge-bot[bot] merged 30 commits into
opendatahub-io:mainfrom
ppadti:mr-sync-2026-06-16

Conversation

@ppadti

@ppadti ppadti commented Jun 16, 2026

Copy link
Copy Markdown
Contributor

Description

Sync to pull in changes from:

Conflicts Resolved

The following conflicts were resolved during this sync:

#2827 - Fix the label order in model catalog card and details page

  • frontend/src/concepts/modelCatalog/const.ts
  • frontend/src/app/pages/modelCatalog/components/ModelCatalogLabels.tsx

Nature of conflict: The downstream fork has an additional RED_HAT key in MODEL_CATALOG_POPOVER_MESSAGES that upstream does not have, causing context mismatch in const.ts. In ModelCatalogLabels.tsx, the downstream version had a data-testid="validated-task-icon" attribute on the validated icon that upstream did not include.

Resolution: Applied the upstream text change to the VALIDATED popover message while preserving the downstream-only RED_HAT key. For ModelCatalogLabels.tsx, took the full upstream version which adds task sorting logic (validated tasks first) and a provider label.

#2822 - fix(ui): fix reset-all-defaults and slider rounding for performance filters

  • frontend/src/concepts/modelCatalog/const.ts

Nature of conflict: Same downstream RED_HAT key difference caused context mismatch for the patch targeting PERFORMANCE_FILTER_KEYS and getAllFiltersToShow.

Resolution: Applied the upstream changes — moved MIN_VRAM and IMAGE_SIZE out of PERFORMANCE_FILTER_KEYS (sidebar-only filters) and added them explicitly in getAllFiltersToShow. Preserved the downstream RED_HAT key.

#2833 - chore(deps): bump github.com/onsi/gomega from 1.40.0 to 1.42.0

  • bff/go.mod

Nature of conflict: Downstream has different go.mod context (different kubeflow/hub/pkg/openapi version) causing patch context mismatch.

Resolution: Applied the gomega version bump from v1.40.0 to v1.42.0.

#2839 - chore(deps): bump tmp from 0.2.6 to 0.2.7

  • frontend/package-lock.json

Nature of conflict: Downstream already had tmp at v0.2.7, so the patch context expecting v0.2.6 didn't match.

Resolution: No-op — the downstream was already at the target version. Conflict markers removed.

#2852 - feat(ui): resolve hardware configs from cold-start artifacts and filter query OR clause

  • frontend/src/app/pages/modelCatalog/components/ModelCatalogCardBody.tsx
  • frontend/src/app/pages/modelCatalog/utils/modelCatalogUtils.ts

Nature of conflict: Downstream import paths differ from upstream (CatalogSource imported from ~/app/modelCatalogTypes vs ~/app/shared/types/catalogTypes), causing context mismatch.

Resolution: Applied all upstream changes (cold-start artifact separation, hardware config resolution, filter query OR clause) while preserving downstream import conventions.

#2831 - chore(deps): bump github.com/onsi/ginkgo/v2 from 2.29.0 to 2.31.0

  • bff/go.mod

Nature of conflict: Downstream go.mod has different context around the ginkgo dependency line.

Resolution: Applied the ginkgo version bump from v2.29.0 to v2.31.0.

#2849 - chore(deps): bump dompurify from 3.4.0 to 3.4.10

  • frontend/package.json
  • frontend/package-lock.json

Nature of conflict: Downstream was already at dompurify v3.4.9, so the patch expecting v3.4.0 didn't match.

Resolution: Updated from v3.4.9 to v3.4.10 in both package.json and package-lock.json.

Additional Downstream Change

  • Updated "Explore Red Hat AI validated models" button text to "Explore Red Hat AI - validated models" (added hyphen with spaces) in ValidatedModelsBanner.tsx.

How Has This Been Tested?

Tested by running the federated model-registry package locally, verifying existing behavior in the files this diff touches, and verifying the incoming changes.

Also ran available test scripts in packages/model-registry/upstream/frontend:

  • test:lint — passed (0 warnings)
  • test:unit — 823 tests passing across 64 suites
  • test:type-check — passed clean

Test Impact

Upstream changes include their own tests.

Request review criteria:

Self checklist (all need to be checked):

  • The developer has manually tested the changes and verified that the changes work
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has added tests or explained why testing cannot be added (unit or cypress tests for related changes)
  • The code follows our Best Practices (React coding standards, PatternFly usage, performance considerations)

If you have UI changes:

  • Included any necessary screenshots or gifs if it was a UI change.
  • Included tags to the UX team if it was a UI/UX change.

After the PR is posted & before it merges:

  • The developer has tested their solution on a cluster by using the image produced by the PR to main

@coderabbitai

coderabbitai Bot commented Jun 16, 2026

Copy link
Copy Markdown
Contributor
📝 Walkthrough

Walkthrough

The subtree.commit field in packages/model-registry/package.json is updated from 3e8c430880aac2fbaf0b26e74d596609a5d95163 to ef896c3877ec18e6feca9c97210307ae5850edbb. No other fields in the file are modified.


Supply chain surface (CWE-829: Inclusion of Functionality from Untrusted Control Sphere): This is a subtree commit pin change. The new SHA ef896c3877ec18e6feca9c97210307ae5850edbb must be verified against the canonical upstream kubeflow/model-registry repository. Confirm:

  1. The commit exists on the expected branch/tag in the upstream repo — not on a fork or attacker-controlled remote.
  2. The diff between 3e8c430880aac2fbaf0b26e74d596609a5d95163 and ef896c3877ec18e6feca9c97210307ae5850edbb has been reviewed for unexpected code introduction.
  3. No git subtree remote URL was silently altered alongside this pin (check .gitmodules, git config, and any subtree helper scripts).
🚥 Pre-merge checks | ✅ 9 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Title check ❓ Inconclusive The title references a specific upstream commit (acdf013) but does not clearly indicate the main change is a package.json subtree commit SHA update. Clarify the title to explicitly state the primary change, e.g., 'Update model-registry subtree commit to ef896c3' or 'Sync model-registry subtree to upstream commit ef896c3'.
✅ Passed checks (9 passed)
Check name Status Explanation
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Contribution Quality And Spam Detection ✅ Passed This is a legitimate git subtree synchronization PR. PR references real upstream PRs with detailed conflict resolution showing deep codebase knowledge; minimal change (1 line); no security fix clai...
No Hardcoded Secrets ✅ Passed No hardcoded secrets found. PR only updates git commit SHA in package.json, which is public information. No API keys, tokens, passwords, credentials, or suspicious base64 strings in any files.
No Weak Cryptography ✅ Passed PR contains only a subtree commit SHA update in package.json; no cryptographic primitives, custom crypto implementations, or insecure secret comparisons found in code.
No Injection Vectors ✅ Passed No injection vectors detected. Code changes are limited to hardcoded constants in const.ts and safe React component rendering in ModelCatalogLabels.tsx with trusted enum values. No CWE-89, CWE-78,...
No Privileged Containers ✅ Passed PR only updates subtree.commit SHA in package.json metadata. No Kubernetes/OpenShift manifests, Helm templates, or Dockerfiles were modified; no privileged container patterns detected.
No Sensitive Data In Logs ✅ Passed No logging statements expose passwords, tokens, API keys, PII, session IDs, or raw request/response bodies. Development-only debug logging is properly guarded by NODE_ENV checks. Token handling cod...
Description check ✅ Passed The description is comprehensive and covers upstream PR details, conflict resolution, testing methodology, and self-checklist completion, fulfilling all major template requirements.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@codecov

codecov Bot commented Jun 16, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 6.59341% with 85 lines in your changes missing coverage. Please review.
✅ Project coverage is 63.08%. Comparing base (0aae7a6) to head (12d115c).
⚠️ Report is 22 commits behind head on main.

Files with missing lines Patch % Lines
.../app/pages/modelCatalog/utils/modelCatalogUtils.ts 13.33% 39 Missing ⚠️
...ges/modelCatalog/components/ModelCatalogLabels.tsx 0.00% 18 Missing ⚠️
...s/modelCatalog/components/ModelCatalogCardBody.tsx 0.00% 7 Missing ⚠️
...c/app/context/modelCatalog/ModelCatalogContext.tsx 0.00% 4 Missing ⚠️
...lCatalog/components/HardwareConfigurationTable.tsx 0.00% 4 Missing ⚠️
...pages/modelCatalog/utils/performanceFilterUtils.ts 0.00% 4 Missing ⚠️
...tream/frontend/src/app/api/modelCatalog/service.ts 0.00% 3 Missing ⚠️
...s/modelCatalog/screens/PerformanceInsightsView.tsx 0.00% 3 Missing ⚠️
...egistry/src/modelCatalog/ValidatedModelsBanner.tsx 0.00% 1 Missing ⚠️
...es/modelCatalog/components/SidebarSliderFilter.tsx 0.00% 1 Missing ⚠️
... and 1 more
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #8132      +/-   ##
==========================================
- Coverage   63.38%   63.08%   -0.30%     
==========================================
  Files        2725     2729       +4     
  Lines       83930    84486     +556     
  Branches    21356    21406      +50     
==========================================
+ Hits        53195    53298     +103     
- Misses      30735    31188     +453     
Files with missing lines Coverage Δ
...try/upstream/frontend/src/app/modelCatalogTypes.ts 100.00% <ø> (ø)
...es/modelCatalog/components/ModelCatalogFilters.tsx 9.75% <ø> (ø)
...stream/frontend/src/concepts/modelCatalog/const.ts 91.76% <ø> (ø)
...egistry/src/modelCatalog/ValidatedModelsBanner.tsx 0.00% <0.00%> (ø)
...es/modelCatalog/components/SidebarSliderFilter.tsx 2.85% <0.00%> (ø)
...talog/components/globalFilters/SliderWithInput.tsx 3.22% <0.00%> (ø)
...tream/frontend/src/app/api/modelCatalog/service.ts 30.13% <0.00%> (-0.85%) ⬇️
...s/modelCatalog/screens/PerformanceInsightsView.tsx 4.54% <0.00%> (-0.22%) ⬇️
...c/app/context/modelCatalog/ModelCatalogContext.tsx 3.09% <0.00%> (-0.07%) ⬇️
...lCatalog/components/HardwareConfigurationTable.tsx 3.12% <0.00%> (-0.21%) ⬇️
... and 4 more

... and 74 files with indirect coverage changes


Continue to review full report in Codecov by Harness.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9c6c185...12d115c. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@manaswinidas

Copy link
Copy Markdown
Member

/retest

@ppadti ppadti force-pushed the mr-sync-2026-06-16 branch from 27967ea to 6cc0f20 Compare June 17, 2026 11:11
@ppadti ppadti changed the title Sync from kubeflow/model-registry d732d57 Sync from kubeflow/model-registry ef896c3 Jun 17, 2026
ppadti and others added 20 commits June 17, 2026 19:04
…talog card and details page (opendatahub-io#2827) (resolved conflicts)

Upstream commit: cc54e0d36e70eaad1a3f8a9c98f75ed005214b04
… and slider rounding for performance filters (opendatahub-io#2822) (resolved conflicts)

Upstream commit: 5ff24d696e2cba56ef6e2b4dff4dba6a80351678
…si/gomega from 1.40.0 to 1.42.0 in /clients/ui/bff (opendatahub-io#2833) (resolved conflicts)

Upstream commit: 92b09821a093167b29156bd0594edffb83b53ac7
…me (opendatahub-io#2847)

Upstream commit: 801ef92f4eddacdaf4fad808203b098a00b0d698
…6 to 0.2.7 in /clients/ui/frontend (opendatahub-io#2839) (no-op, already at 0.2.7)

Co-authored-by: Cursor <cursoragent@cursor.com>
…629c7d4d7319235fb981 (no file changes, tmp already at 0.2.7)

Co-authored-by: Cursor <cursoragent@cursor.com>
ppadti and others added 8 commits June 17, 2026 19:04
…igs from cold-start artifacts and filter query OR clause (opendatahub-io#2852) (resolved conflicts)

Upstream commit: 37bb620e09751a42ca589303fb2399dff7fa0308
…m 4.0.5 to 4.0.6 in /clients/ui/frontend (opendatahub-io#2845)

Upstream commit: ef896c3877ec18e6feca9c97210307ae5850edbb
Co-authored-by: Cursor <cursoragent@cursor.com>
…si/ginkgo/v2 from 2.29.0 to 2.31.0 in /clients/ui/bff (opendatahub-io#2831) (resolved conflicts)

Upstream commit: da7e71a499297ca4017768be8a849e8883093163
… from 2.11.1 to 2.14.1 in /clients/ui/frontend (opendatahub-io#2844)

Upstream commit: e015d67717a9ee8f692b038707168dce7dd8e992
…m 3.4.0 to 3.4.10 in /clients/ui/frontend (opendatahub-io#2849) (resolved conflicts)

Upstream commit: f4324ea8bb4245761f14c4ac2973075a05f93542
…tainer with InnerScrollContainer for hardware config table (opendatahub-io#2854)

Upstream commit: 5848ed75b70f288eebd6e9509e90b22ea9be34e2
…om being passed when the performance toggle is off (opendatahub-io#2853)

Upstream commit: acdf0135544891be7e245017356b6731e5e01e56
@ppadti ppadti force-pushed the mr-sync-2026-06-16 branch from 6cc0f20 to 4ad3028 Compare June 17, 2026 13:55
@ppadti ppadti changed the title Sync from kubeflow/model-registry ef896c3 Sync from kubeflow/model-registry acdf013 Jun 17, 2026
Left over from conflict marker removal during subtree sync.

Co-authored-by: Cursor <cursoragent@cursor.com>

@manaswinidas manaswinidas left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@openshift-ci

openshift-ci Bot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: manaswinidas

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot removed the lgtm label Jun 17, 2026
@manaswinidas

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Jun 17, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 65adc6d into opendatahub-io:main Jun 17, 2026
106 of 111 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants